linux blkback/blktap: Request/response identifiers are u64, not long.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
index edd26a3b180655b10dbbac701e955d942c249a4c..8d529c7168873e8bfc30879d484f391ff8b177f8 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
@@ -70,7 +70,7 @@ module_param(debug_lvl, int, 0644);
  */
 typedef struct {
        blkif_t       *blkif;
-       unsigned long  id;
+       u64            id;
        int            nr_pages;
        atomic_t       pendcnt;
        unsigned short operation;
@@ -107,7 +107,7 @@ static int do_block_io_op(blkif_t *blkif);
 static void dispatch_rw_block_io(blkif_t *blkif,
                                 blkif_request_t *req,
                                 pending_req_t *pending_req);
-static void make_response(blkif_t *blkif, unsigned long id, 
+static void make_response(blkif_t *blkif, u64 id,
                          unsigned short op, int st);
 
 /******************************************************************
@@ -515,7 +515,7 @@ static void dispatch_rw_block_io(blkif_t *blkif,
  */
 
 
-static void make_response(blkif_t *blkif, unsigned long id, 
+static void make_response(blkif_t *blkif, u64 id,
                          unsigned short op, int st)
 {
        blkif_response_t  resp;

diff --git a/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c b/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c
index 4fdb601ebec03eb4e3b823a6086b1a20e611a449..fc36a768f9d916f7f2a382fecff2757264e3d706 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c
@@ -136,7 +136,7 @@ module_param(debug_lvl, int, 0644);
  */
 typedef struct {
        blkif_t       *blkif;
-       unsigned long  id;
+       u64            id;
        unsigned short mem_idx;
        int            nr_pages;
        atomic_t       pendcnt;
@@ -741,7 +741,7 @@ static int do_block_io_op(blkif_t *blkif);
 static void dispatch_rw_block_io(blkif_t *blkif,
                                 blkif_request_t *req,
                                 pending_req_t *pending_req);
-static void make_response(blkif_t *blkif, unsigned long id, 
+static void make_response(blkif_t *blkif, u64 id,
                           unsigned short op, int st);
 
 /******************************************************************
@@ -1408,7 +1408,7 @@ static void dispatch_rw_block_io(blkif_t *blkif,
  */
 
 
-static void make_response(blkif_t *blkif, unsigned long id, 
+static void make_response(blkif_t *blkif, u64 id,
                           unsigned short op, int st)
 {
        blkif_response_t  resp;